<!DOCTYPE html>
<html lang="en">
<head>
    <meta charset="UTF-8">
    <meta http-equiv="X-UA-Compatible" content="IE=edge">
    <meta name="viewport" content="width=device-width, initial-scale=1.0">
    <title>首页</title>
    <link rel="stylesheet" href="css/style.css" />
</head>
<body>
    我是首页的内容1
<<<<<<< HEAD
    1 + 1 = 2
=======
<<<<<<< HEAD
    <div>这是我crl编辑的内容</div>
=======
    我是自己的分支
>>>>>>> 8951d634dc23230e5b562ab5d4855de49abb879f
>>>>>>> cb2983e6e5afb47eb1270f8fc15b6f8f1b5d4ac7
</body>
</html>